Autogenerated HTML docs for v1.7.0.2-157-gb7e7f
diff --git a/RelNotes-1.7.0.2.txt b/RelNotes-1.7.0.2.txt index e44e010..fcb46ca 100644 --- a/RelNotes-1.7.0.2.txt +++ b/RelNotes-1.7.0.2.txt
@@ -38,9 +38,3 @@ file. And other minor fixes and documentation updates. - ---- -exec >/var/tmp/1 -O=v1.7.0.1-64-g7d18122 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint
diff --git a/git-grep.html b/git-grep.html index 624aaf6..261d4bd 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -321,8 +321,7 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git grep</em> [--cached] - [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] +<div class="content"><em>git grep</em> [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] @@ -333,7 +332,8 @@ [--color[=<when>] | --no-color] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> - [--and|--or|--not|(|)|-e <pattern>…] [<tree>…] + [--and|--or|--not|(|)|-e <pattern>…] + [--cached | --no-index | <tree>…] [--] [<pathspec>…]</div></div> </div> <h2 id="_description">DESCRIPTION</h2> @@ -349,8 +349,16 @@ </dt> <dd> <p> - Instead of searching in the working tree files, check - the blobs registered in the index file. + Instead of searching tracked files in the working tree, search + blobs registered in the index file. +</p> +</dd> +<dt> +--no-index +</dt> +<dd> +<p> + Search files in the current directory, not just those tracked by git. </p> </dd> <dt> @@ -500,8 +508,8 @@ <p> Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatibility with <em>git diff</em>, --name-only is a - synonym for --files-with-matches. + For better compatibility with <em>git diff</em>, <tt>--name-only</tt> is a + synonym for <tt>--files-with-matches</tt>. </p> </dd> <dt> @@ -563,7 +571,7 @@ </dt> <dd> <p> - A shortcut for specifying -C<num>. + A shortcut for specifying <tt>-C<num></tt>. </p> </dd> <dt> @@ -595,7 +603,7 @@ <dd> <p> The next parameter is the pattern. This option has to be - used for patterns starting with - and should be used in + used for patterns starting with <tt>-</tt> and should be used in scripts passing user input to grep. Multiple patterns are combined by <em>or</em>. </p> @@ -643,11 +651,12 @@ </p> </dd> <dt> -<tt><tree>…</tt> +<tree>… </dt> <dd> <p> - Search blobs in the trees for specified patterns. + Instead of searching tracked files in the working tree, search + blobs in the given trees. </p> </dd> <dt> @@ -670,7 +679,7 @@ </dd> </dl></div> </div> -<h2 id="_example">Example</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> <div class="vlist"><dl> <dt> @@ -717,7 +726,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-03-03 05:12:41 UTC +Last updated 2010-03-07 22:24:59 UTC </div> </div> </body>
diff --git a/git-grep.txt b/git-grep.txt index 6305f6d..4b32322 100644 --- a/git-grep.txt +++ b/git-grep.txt
@@ -9,8 +9,7 @@ SYNOPSIS -------- [verse] -'git grep' [--cached] - [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] +'git grep' [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] @@ -21,7 +20,8 @@ [--color[=<when>] | --no-color] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> - [--and|--or|--not|(|)|-e <pattern>...] [<tree>...] + [--and|--or|--not|(|)|-e <pattern>...] + [--cached | --no-index | <tree>...] [--] [<pathspec>...] DESCRIPTION @@ -33,8 +33,11 @@ OPTIONS ------- --cached:: - Instead of searching in the working tree files, check - the blobs registered in the index file. + Instead of searching tracked files in the working tree, search + blobs registered in the index file. + +--no-index:: + Search files in the current directory, not just those tracked by git. -a:: --text:: @@ -98,8 +101,8 @@ --files-without-match:: Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatibility with 'git diff', --name-only is a - synonym for --files-with-matches. + For better compatibility with 'git diff', `--name-only` is a + synonym for `--files-with-matches`. -z:: --null:: @@ -127,7 +130,7 @@ matches. -<num>:: - A shortcut for specifying -C<num>. + A shortcut for specifying `-C<num>`. -p:: --show-function:: @@ -142,7 +145,7 @@ -e:: The next parameter is the pattern. This option has to be - used for patterns starting with - and should be used in + used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'. @@ -165,8 +168,9 @@ Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't. -`<tree>...`:: - Search blobs in the trees for specified patterns. +<tree>...:: + Instead of searching tracked files in the working tree, search + blobs in the given trees. \--:: Signals the end of options; the rest of the parameters @@ -176,8 +180,8 @@ If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported. -Example -------- +Examples +-------- git grep 'time_t' -- '*.[ch]':: Looks for `time_t` in all tracked .c and .h files in the working
diff --git a/git-pack-objects.html b/git-pack-objects.html index 1176670..ec4190f 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html
@@ -473,8 +473,8 @@ <dd> <p> This flag causes an object already in a local pack that - has a .keep file to be ignored, even if it appears in the - standard input. + has a .keep file to be ignored, even if it it would have + otherwise been packed. </p> </dd> <dt> @@ -482,8 +482,8 @@ </dt> <dd> <p> - This flag causes an object already in a pack ignored - even if it appears in the standard input. + This flag causes an object already in a pack to be ignored + even if it would have otherwise been packed. </p> </dd> <dt> @@ -491,10 +491,9 @@ </dt> <dd> <p> - This flag is similar to <tt>--incremental</tt>; instead of - ignoring all packed objects, it only ignores objects - that are packed and/or not in the local object store - (i.e. borrowed from an alternate). + This flag causes an object that is borrowed from an alternate + object store to be ignored even if it would have otherwise been + packed. </p> </dd> <dt> @@ -675,7 +674,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-19 09:57:45 UTC +Last updated 2010-03-07 22:24:59 UTC </div> </div> </body>
diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 034caed..8ed09c0 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -115,18 +115,17 @@ --honor-pack-keep:: This flag causes an object already in a local pack that - has a .keep file to be ignored, even if it appears in the - standard input. + has a .keep file to be ignored, even if it it would have + otherwise been packed. --incremental:: - This flag causes an object already in a pack ignored - even if it appears in the standard input. + This flag causes an object already in a pack to be ignored + even if it would have otherwise been packed. --local:: - This flag is similar to `--incremental`; instead of - ignoring all packed objects, it only ignores objects - that are packed and/or not in the local object store - (i.e. borrowed from an alternate). + This flag causes an object that is borrowed from an alternate + object store to be ignored even if it would have otherwise been + packed. --non-empty:: Only create a packed archive if it would contain at
diff --git a/git-rev-parse.html b/git-rev-parse.html index 1af5d75..ad9bab6 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -595,6 +595,17 @@ </p> </dd> <dt> +--local-env-vars +</dt> +<dd> +<p> + List the GIT_* environment variables that are local to the + repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). + Only the names of the variables are listed, not their value, + even if they are set. +</p> +</dd> +<dt> --short </dt> <dt> @@ -1058,7 +1069,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-19 09:57:46 UTC +Last updated 2010-03-07 22:24:59 UTC </div> </div> </body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 1a613aa..8db600f 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -148,6 +148,12 @@ --is-bare-repository:: When the repository is bare print "true", otherwise "false". +--local-env-vars:: + List the GIT_* environment variables that are local to the + repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). + Only the names of the variables are listed, not their value, + even if they are set. + --short:: --short=number:: Instead of outputting the full SHA1 values of object names try to
diff --git a/git.html b/git.html index 951e7b2..3cb397c 100644 --- a/git.html +++ b/git.html
@@ -2081,7 +2081,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-03-03 05:12:42 UTC +Last updated 2010-03-07 22:24:59 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index 98b6e16..35c0c79 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.0.1/git.html[documentation for release 1.7.0.1] +* link:v1.7.0.2/git.html[documentation for release 1.7.0.2] * release notes for + link:RelNotes-1.7.0.2.txt[1.7.0.2], link:RelNotes-1.7.0.1.txt[1.7.0.1], link:RelNotes-1.7.0.txt[1.7.0].
